bitkeeper revision 1.1159.212.96 (4204aff5pQipffND8_37kyj01pfiWQ)

Hand merge changes to schedule.c

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc xen/common/schedule.c
index 46176cf820ee3bd52aeaae730913128a2d947bb2,ec215d5ed9a3fda253a819940c043e1c8826444e..e0fafa6b9c9425488a8a2a3147f0ed9abf26bade
--- 1/xen/common/schedule.c
--- 2/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@@ -429,6 -367,8 +422,13 @@@ void __enter_scheduler(void
      
      perfc_incrc(sched_ctx);
  
 -    cleanup_writable_pagetable(prev);
++    if ( !is_idle_task(current->domain) )
++    {
++        LOCK_BIGLOCK(current->domain);
++        cleanup_writable_pagetable(prev->domain);
++        UNLOCK_BIGLOCK(current->domain);
++    }
+ 
  #if defined(WAKE_HISTO)
      if ( !is_idle_task(next) && next->wokenup ) {
          ulong diff = (ulong)(now - next->wokenup);